Make build-time testing more strict

diff --git a/debian/changelog b/debian/changelog
index 432192be6129eb10902b9a45e6eb5af51dff8827..63350f8ba9d121a78df1bde4c23dfd61f228e8f0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ ostree (2017.12-1) UNRELEASED; urgency=medium
     We don't actually need Internet access, so this is OK.
   * debian/test.sh: Unexport HTTP proxy variables for build-time tests
     too
+  * Make build-time test failures fatal if they fail at least twice
+    out of 5 tries (previously they had to fail at least 3 times)
 
  -- Simon McVittie <smcv@debian.org>  Tue, 03 Oct 2017 19:14:14 +0100
 

diff --git a/debian/test.sh b/debian/test.sh
index f23a06f4387d55291f08eb63e2e9111b24f715b4..eadeda4ef35bd0cd772ff2f8daa1db1c0143fc11 100755 (executable)
--- a/debian/test.sh
+++ b/debian/test.sh
@@ -38,7 +38,7 @@ fi
 # There are several race conditions that cause intermittent failures.
 # They are not actually a regression - we've just been luckier in the
 # past - so let newer versions build reliably.
-if [ "$failed" -gt 2 ]; then
+if [ "$failed" -gt 1 ]; then
     echo "Failed $failed out of $try_tests test runs; that seems bad"
     exit 1
 elif [ "$failed" -gt 0 ]; then